Delete merge marker.

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index f796f2d5558dddcff180068a0cb53c9f48cf9d40..1524f000450b1b5147430c705e4e9799d504a2fb 100644 (file)
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -43,7 +43,6 @@
        (mml-smime-epg-find-usable-secret-key): New helper function copied from
        mml2015.el.
 
->>>>>>> MERGE-SOURCE
 2012-12-31  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
        * gnus-msg.el (gnus-inews-insert-gcc): Don't insert Gcc headers if Gnus